Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 6 May 2011 06:30:56 +0000 (23:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 6 May 2011 06:30:56 +0000 (23:30 -0700)
commitafe599bd2a7efb2b24c12f659dfd158b52adca2d
treee14a4b4cf05d3ad9589b44b1266da6dc3873c7a7
parent61b3aff0b9db955c2dee0be6e33138e0227435cb
parent77265a07f70524584fab768f9e44e31c131b845d
Merge from mainline.
Makefile.in
src/ChangeLog
src/image.c
src/lread.c